Auto merge of #2077 - Lechindianer:master, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 22 Oct 2015 21:59:36 +0000 (21:59 +0000)
committerbors <bors@rust-lang.org>
Thu, 22 Oct 2015 21:59:36 +0000 (21:59 +0000)
commite1ed9956e079a563796fb380871f4b67619f58ee
tree0a2f9e33df0dac095c0882dc8f8e2ee65063e283
parent829408cfae41787fa85c84946705a3479f7f9d27
parent295579ccf90ca3d4c52d05aa628e77220a6fc11c
Auto merge of #2077 - Lechindianer:master, r=alexcrichton

Just a simple fix